Rename gtkcolorswatchaccessible.h

Call it gtkcolorswatchaccessibleprivate.h. This matches what we're
doing for non-public widget headers in gtk/.

diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 3ad5bae6725a222e3c3b02bc00e9cf2094c5ad60..cfad1b6e573b5fbdab3bfb0a912ca644bde595d8 100644 (file)
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -101,7 +101,7 @@ gtka11y_private_h_sources =         \
        gtkaccessibility.h              \
        gtkaccessibilityutil.h          \
        gtkaccessibilitymisc.h          \
-       gtkcolorswatchaccessible.h      \
+       gtkcolorswatchaccessibleprivate.h \
        gtkcellaccessibleprivate.h      \
        gtklockbuttonaccessibleprivate.h \
        gtkiconviewaccessibleprivate.h  \

diff --git a/gtk/a11y/gtkcolorswatchaccessible.c b/gtk/a11y/gtkcolorswatchaccessible.c
index e2bc96770439669130d6282c6c67e122d081650c..4ca6c7df5dcf952951cc9f04f6342aa009e62c9c 100644 (file)
--- a/gtk/a11y/gtkcolorswatchaccessible.c
+++ b/gtk/a11y/gtkcolorswatchaccessible.c
@@ -18,7 +18,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include "gtkcolorswatchaccessible.h"
+#include "gtkcolorswatchaccessibleprivate.h"
 
 static void atk_action_interface_init (AtkActionIface *iface);
 

diff --git a/gtk/a11y/gtkcolorswatchaccessible.h b/gtk/a11y/gtkcolorswatchaccessible.h
deleted file mode 100644 (file)
index 123f65f..0000000
--- a/gtk/a11y/gtkcolorswatchaccessible.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* GTK+ - accessibility implementations
- * Copyright 2012, Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_COLOR_SWATCH_ACCESSIBLE_H__
-#define __GTK_COLOR_SWATCH_ACCESSIBLE_H__
-
-#include <gtk/a11y/gtkwidgetaccessible.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SWATCH_ACCESSIBLE                         (_gtk_color_swatch_accessible_get_type ())
-#define GTK_COLOR_SWATCH_ACCESSIBLE(obj)                         (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE, GtkColorSwatchAccessible))
-#define GTK_COLOR_SWATCH_ACCESSIBLE_CLASS(klass)                       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE, GtkColorSwatchAccessibleClass))
-#define GTK_IS_COLOR_SWATCH_ACCESSIBLE(obj)                      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE))
-#define GTK_IS_COLOR_SWATCH_ACCESSIBLE_CLASS(klass)              (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE))
-#define GTK_COLOR_SWATCH_ACCESSIBLE_GET_CLASS(obj)             (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE, GtkColorSwatchAccessibleClass))
-
-typedef struct _GtkColorSwatchAccessible        GtkColorSwatchAccessible;
-typedef struct _GtkColorSwatchAccessibleClass   GtkColorSwatchAccessibleClass;
-typedef struct _GtkColorSwatchAccessiblePrivate GtkColorSwatchAccessiblePrivate;
-
-struct _GtkColorSwatchAccessible
-{
-  GtkWidgetAccessible parent;
-
-  GtkColorSwatchAccessiblePrivate *priv;
-};
-
-struct _GtkColorSwatchAccessibleClass
-{
-  GtkWidgetAccessibleClass parent_class;
-};
-
-GType _gtk_color_swatch_accessible_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SWATCH_ACCESSIBLE_H__ */

diff --git a/gtk/a11y/gtkcolorswatchaccessibleprivate.h b/gtk/a11y/gtkcolorswatchaccessibleprivate.h
new file mode 100644 (file)
index 0000000..123f65f
--- /dev/null
+++ b/gtk/a11y/gtkcolorswatchaccessibleprivate.h
@@ -0,0 +1,52 @@
+/* GTK+ - accessibility implementations
+ * Copyright 2012, Red Hat, Inc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_COLOR_SWATCH_ACCESSIBLE_H__
+#define __GTK_COLOR_SWATCH_ACCESSIBLE_H__
+
+#include <gtk/a11y/gtkwidgetaccessible.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COLOR_SWATCH_ACCESSIBLE                         (_gtk_color_swatch_accessible_get_type ())
+#define GTK_COLOR_SWATCH_ACCESSIBLE(obj)                         (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE, GtkColorSwatchAccessible))
+#define GTK_COLOR_SWATCH_ACCESSIBLE_CLASS(klass)                       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE, GtkColorSwatchAccessibleClass))
+#define GTK_IS_COLOR_SWATCH_ACCESSIBLE(obj)                      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE))
+#define GTK_IS_COLOR_SWATCH_ACCESSIBLE_CLASS(klass)              (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE))
+#define GTK_COLOR_SWATCH_ACCESSIBLE_GET_CLASS(obj)             (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SWATCH_ACCESSIBLE, GtkColorSwatchAccessibleClass))
+
+typedef struct _GtkColorSwatchAccessible        GtkColorSwatchAccessible;
+typedef struct _GtkColorSwatchAccessibleClass   GtkColorSwatchAccessibleClass;
+typedef struct _GtkColorSwatchAccessiblePrivate GtkColorSwatchAccessiblePrivate;
+
+struct _GtkColorSwatchAccessible
+{
+  GtkWidgetAccessible parent;
+
+  GtkColorSwatchAccessiblePrivate *priv;
+};
+
+struct _GtkColorSwatchAccessibleClass
+{
+  GtkWidgetAccessibleClass parent_class;
+};
+
+GType _gtk_color_swatch_accessible_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GTK_COLOR_SWATCH_ACCESSIBLE_H__ */

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 8f60708410349e36fffd191dc989cd76408dc240..f6d662b5eeff35614605fb0d395624029205a670 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -31,7 +31,7 @@
 #include "gtkpressandholdprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "a11y/gtkcolorswatchaccessible.h"
+#include "a11y/gtkcolorswatchaccessibleprivate.h"
 
 
 struct _GtkColorSwatchPrivate